Merge changes I72edc4dc,Iead7bd25 am: 8f71c9629d am: 1db5faef58

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

Change-Id: Ia1cf4f7f62da336fb32958e6a156cee0e525d314