[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-2e1c7dae4f32460ebe19c3c08f97b4fd" into sc-v2-dev-plus-aosp am: 79e05262 -s ours

am skip reason: Merged-In I27989b25769eae83eb06ac86146f27baf288b7e1 with SHA-1 9547726f is already in history

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

Change-Id: I82a89089ae388854b510c0ed7dcd524959dc3eb1