Merge changes I172ff126,I46f8adec am: 1e946937e8 am: 323729137e

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

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