Merge changes Icb53182a,I123a9a42,I599bbc69 am: 0065c24b20

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

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