[automerger skipped] Merge changes Id79f9e10,Ia91d8839 into sc-v2-dev am:...

[automerger skipped] Merge changes Id79f9e10,Ia91d8839 into sc-v2-dev am: ae5fe46e -s ours am: db8058f5 -s ours

am skip reason: Merged-In Id79f9e1095f52079393c58edb9a4d526f4cc6b5e with SHA-1 d4c53518 is already in history

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

Change-Id: Icca64a4b39b27f46d63263216eea87c4c1b6a218