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

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



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