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

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

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