Merge changes from topic "am-c9d7d15b50464f4f89f6e75fa6756acd" am: 1515f62d -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: I2070cd475ad8d08fc3fd7263e1f564d7fc4dd7c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>