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

Merge "Revert "Don't trigger lift-to-wake on wireless charger"" into tm-dev am: 0fd363df am: 22bac033

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



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