Merge "Add dock charging state into stay awake feature (2/2)" into tm-qpr-dev am: db8dacec

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



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