Merge changes from topic "am-66f20a14a62845e6a805742ccf92e07a" am: 2c20fe32 -s ours

am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1 is already in history

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



Change-Id: I0b33dfc32e7c350086aecd5b29834757dd52b6db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>