Merge changes I3ba37e4d,Ie07246cd am: e7915e867d

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

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