Merge changes from topic "am-ab2bac0b7a3449d6b71da395a7cf35f1" into tm-d1-dev-plus-aosp am: f0bcd11b

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



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