Merge changes I22583380,I0b6c6650 am: e29b2c2e60 am: 287388ff28

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

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