[automerger skipped] Merge changes I52e778d1,I33f4d1d2 am: 70d34f01 am:...

[automerger skipped] Merge changes I52e778d1,I33f4d1d2 am: 70d34f01 am: 3ac2f677 am: 68d373f6 -s ours

am skip reason: Merged-In I52e778d13cffcae4212acb05ef2bd62b827fbaf3 with SHA-1 473f03bf is already in history

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



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