Merge changes from topic "am-9c3f18c504484a329d7bbb5250902bb6" am: 8b542529 -s ours

am skip reason: Merged-In I72b11d6a1f180c44565b50f3f4e8d2673fde3fec with SHA-1 00234600 is already in history

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



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