Merge changes from topic "am-2f13fd69e56847a893af10a7963fb3e4" into...

Merge changes from topic "am-2f13fd69e56847a893af10a7963fb3e4" into tm-d1-dev-plus-aosp am: 2352a9ed

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



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