[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136"...

[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 25838511 -s ours am: d4427477 -s ours

am skip reason: Merged-In I9b1408b72df34a0d0cbcc1b99e9617f15bc47558 with SHA-1 4762c22a is already in history

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



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