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

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

Change-Id: Ic5f9fe0a8b3a9bea8ad2b5d82c560f10846c1fdd