Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48 am: e0c446c7d2 am: d01120acf0 am: b7a4062363

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

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