Merge changes from topic "crMoveBack" into main am: 0b2278d9a4

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

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