[automerger skipped] Multiple improvements am: 4cc6f84a am: 883ed2e5 -s ours

am skip reason: Merged-In I47b060021ce46b6e9fbe4aca63835745311a4b06 with SHA-1 c8dac37e is already in history

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



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