[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c9d7d15b50464f4f89f6e75fa6756acd" am: 1515f62d -s ours am: 8f5ebbb1 -s ours am: 0f761ff4 -s ours am: c01346f3 -s ours am: 298a5dd4 -s ours

am skip reason: Merged-In Iab78a57d4329095358cad6e79088909b48a22264 with SHA-1 391aaf65 is already in history

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



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