Merge "Add dock charging state into stay awake feature (1/2)" into tm-qpr-dev...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19114749



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