Merge changes from topic "am-58716186f5b942dba5730c9eff837985" into...

Merge changes from topic "am-58716186f5b942dba5730c9eff837985" into tm-d1-dev-plus-aosp am: 6543917a

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



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