Merge changes Idcff0bf3,Ic5b4713e am: eebd95b54d

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

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