Merge changes If4c37940,I009c8bef am: f071884b31 am: 2e3eec2b76 am: 706411fa75

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

Change-Id: I241bb2490b6dc9926241c7a6653d09e20a435057