Merge changes from topic "am-2201364a6cf442e88b472c0e36774c37" into...

Merge changes from topic "am-2201364a6cf442e88b472c0e36774c37" into tm-d1-dev-plus-aosp am: f0f488c4

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



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