Merge "Add the flag "clear top" when launching battery settings view" into...

Merge "Add the flag "clear top" when launching battery settings view" into tm-dev am: 12e6a218 am: eb365e0a

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



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