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

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

Change-Id: Ie44bee609e5002e400c00a1b1e2e09e16ff2d56e