Merge changes I40e7effe,I526d6105,I020f35a2 am: 59f0820b83 am: e3f99e9828 am: 650bcb9058

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

Change-Id: I259fbe8c1ae710cb7eed21bd7dd1b98312be0c42