Merge changes If4c37940,I009c8bef am: f071884b31

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

Change-Id: I75dc57a3167dc51eaaa4c9c88d43123bb833ac7e