Merge changes Idcff0bf3,Ic5b4713e am: eebd95b54d am: f8c69c1eb7

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

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