Merge changes from topic "am-4bf8d572a7a148b890f27a2db1c84b98" into...

Merge changes from topic "am-4bf8d572a7a148b890f27a2db1c84b98" into tm-d1-dev-plus-aosp am: 1a7716fb

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



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