Merge changes from topic "am-9a49fb5929b248dea09a673f1535752d" into...

Merge changes from topic "am-9a49fb5929b248dea09a673f1535752d" into tm-d1-dev-plus-aosp am: fb4389e3

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



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