Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev
am: 00ac782f3e

Change-Id: I5151ab5ba2ed2dfb94460a118705b3f68a18f777