Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 9a5bfe60e7 -s ours

am skip reason: Merged-In I0eeebc3600b34c03a07bfe1cf1bff2fbdebc42c3 with SHA-1 6c7cb43548 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2338397

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