Merge changes Ia1d8fa93,I8434508e,I4beb9865,Ib80360ce am: b2292d160c am: b69eb61ca0

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

Change-Id: Ie50dadd43504ab35a21e7f1f81df21a6e29993af