Merge changes Iadd5728a,Ib89a21d5,Icd93fbcb am: 214072a4e7 am: 7b560404d6 am: 0ec4ac54a1 am: 6ef91520a1 am: e8e17b4a1d

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

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