[automerger skipped] Merge changes...

[automerger skipped] Merge changes Iaf2ec527,I6d6abd44,I6304e0de,Ia4fbce58,I3b60dfa4, ... into sc-dev am: 8f654d8a -s ours

am skip reason: Merged-In Iaf2ec52701277f26cc81f3e15a47b6083a788334 with SHA-1 3431d526 is already in history

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

Change-Id: Ie188049615bab6efdc420535f9e599b0c50df8f2