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: 22bac033 am: 33b8eba8" into tm-qpr-dev-plus-aosp am: f6b54d7f

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



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