Merge changes Icb53182a,I123a9a42,I599bbc69 am: 0065c24b20 am: a41ee79c45

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

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