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

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



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