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

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

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