Merge changes from topic "am-6109f81bfb984ecaa06f3f826ebeee7d" am: 9bf90f14 -s ours

am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9 is already in history

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



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