Merge changes Icbcba3c3,I96d164e3 am: c662cbf091 am: 18d10f0c4a am: f766a7e3fb

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

Change-Id: I381016ca09d7452ecdae6d2ba20b02e5692ff5f3