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

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



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