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

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

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