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

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

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