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

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

Change-Id: I0d1eace71cd880236351812f6721e289560636d2