Merge changes Iadd5728a,Ib89a21d5,Icd93fbcb am: 214072a4e7

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

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