[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: e7bb1bcf -s ours am: 5e1c9e1b -s ours

am skip reason: Merged-In I44fa52308eef41e6585b13a236f36f9cebfb2db2 with SHA-1 8e2cf892 is already in history

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

Change-Id: I3a35441c753c6d1d47c9e662c91c0d6149c7e21f