[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-97d7d515ee0e4d1f9c5725ee300e632f" into sc-v2-dev-plus-aosp am: 706b7a9c -s ours

am skip reason: Merged-In I92d34a253039eb677d4df9fad8a0821fbc684f57 with SHA-1 bdb981d1 is already in history

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

Change-Id: I5b7409c84e8a866c80abae95bcbbae28b1f443fa