Merge changes I172ff126,I46f8adec am: 1e946937e8

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

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