Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into...

Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: e28a4185 -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/+/2186853



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