Merge changes I7950b5b8,If6fdb8a4,I5fa84727,I3d926464 am: a0076030b4 am: 4f87afaeae

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

Change-Id: I2ee6ea1611054547b4c789108e223a49f08c4c94