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

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

Change-Id: I0535395917adbbfaf71a54962d0655adde6513f8