Merge changes I10154f5b,I312175f9 am: 4ce6f1a8d6 am: 5faa5d7169

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

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