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

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

Change-Id: I781db91f5ff103b85aa8898ae0e774078db297d5