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

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

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