[automerger skipped] Merge changes...

[automerger skipped] Merge changes I363dc391,I84786697,I8d80872d,I4d6aa4d7,I396d376a into tm-qpr-dev am: 5926e155 am: ad53d223 -s ours

am skip reason: Merged-In I363dc3918465de7fdb74f833fae78f46bde72a37 with SHA-1 3aa15125 is already in history

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



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