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

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

Change-Id: I7c4c74c5a85aca61750cdb687cb15393255bae7c