Merge changes from topic "am-f4fda1f5a74c40ad8ce0d51611675f84" into...

Merge changes from topic "am-f4fda1f5a74c40ad8ce0d51611675f84" into tm-d1-dev-plus-aosp am: d4768de5 -s ours

am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 e51c4026 is already in history

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



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