Merge "Merge "Revert "Don't trigger lift-to-wake on wireless charger"" into...

Merge "Merge "Revert "Don't trigger lift-to-wake on wireless charger"" into tm-dev am: 0fd363df am: 19d32033 am: bbb36c31" into tm-qpr-dev-plus-aosp am: 4315b229

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188318



Change-Id: Iaa126c1f589e008467e722d638c9b65e21f574af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>