Merge changes I4e6b26e8,I7980780a,Icdad51df am: 69419abcf5 am: be1e683c0b am: a15cebeada

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

Change-Id: I1497ec13b63f1c4bc15f3b9e347312db47a8c314