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

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

Change-Id: I0fe4c118a06766bf9708dc24f23a78f2dca39352