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

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



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