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

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

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