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

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

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