Merge changes from topic "am-929047f04f63492aa317e461df695a23" into...

Merge changes from topic "am-929047f04f63492aa317e461df695a23" into tm-d1-dev-plus-aosp am: 62e0a68b am: d951174b

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



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