Merge changes from topic "am-5ab8b98d744945ad9ca21a34f2809719" into...

Merge changes from topic "am-5ab8b98d744945ad9ca21a34f2809719" into tm-d1-dev-plus-aosp am: cb874660

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



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