Merge changes Ie05c683e,I47026cac am: 5c3c372da8 am: 8fdca1b161

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

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