Merge changes I3ba37e4d,Ie07246cd am: e7915e867d am: 72fb0e7c29 am: 493f96dedf

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

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