Merge changes Iad853184,I92ac8d29 am: 49770d8a66 am: 38c57629d0

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

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