Merge changes Ie05c683e,I47026cac am: 5c3c372da8

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

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