Merge changes Iacf6b4df,I7a4b1a78,I33a7ab28 am: 0e37740be7

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

Change-Id: If49529186da07294b20b47b94f0b8376a0f7f807