Merge changes Iad853184,I92ac8d29 am: 49770d8a66

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

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