Merge changes Idcff0bf3,Ic5b4713e am: eebd95b54d am: f8c69c1eb7 am: 58d441ba68

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

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