Merge changes from topic "228160715_fix" into tm-dev am: e31c7a17

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



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