[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-dace194bade74125a0593d720d33774c" into sc-v2-dev-plus-aosp am: 4f49704b -s ours

am skip reason: Merged-In Iaf7a61c6c9c6cd557f953b1a665e7a1640d357ae with SHA-1 d595de51 is already in history

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

Change-Id: I7eaaee3dd3a50196e1e1ea0ebbc1332b697a6433