Merge changes I4e6b26e8,I7980780a,Icdad51df am: 69419abcf5

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

Change-Id: I4c751340e31a51fba32a6ea7388f680dfda513ae