Merge changes from topic "cherrypicker-L93200030008016034:N05400030132979074"...

Merge changes from topic "cherrypicker-L93200030008016034:N05400030132979074" into tm-dev am: 149ddb17

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



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