Merge changes from topic "am-23cdd723edd24d2d87944d0a1f875495" into...

Merge changes from topic "am-23cdd723edd24d2d87944d0a1f875495" into tm-d1-dev-plus-aosp am: 1707174b

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



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