Merge changes from topic "am-fac9e2f7c7be4f09a419f3f42edb8f6f" into...

Merge changes from topic "am-fac9e2f7c7be4f09a419f3f42edb8f6f" into tm-d1-dev-plus-aosp am: 402aab4b am: 9adc204a

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



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