Merge changes Iacf6b4df,I7a4b1a78,I33a7ab28 am: 0e37740be7 am: 7d3d66a9c2

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

Change-Id: Ic3bd389892dd1e8de786e2b43970d367b2e7bcb2