Merge changes from topic "am-2836a4d711754834abedc83f98b2abed" into android12-tests-dev am: 53542c37

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382



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