[automerger skipped] Merge changes I51628abe,I412d62b7 am: 9e84b316 am:...

[automerger skipped] Merge changes I51628abe,I412d62b7 am: 9e84b316 am: 8f713c56 -s ours am: 86f32650 -s ours am: 8292947b -s ours am: 7c3bb240 -s ours

am skip reason: Change-Id I51628abe05599422eb3f344781d8f3acd653c822 with SHA-1 bd6d2cde is in history

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

Change-Id: I9890699cacb4dde0f9da29794eadc6d0cf7ffc13