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: I64475a81725048c192fe790b34f8644e81d9d38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>