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

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

Change-Id: I4e34862a5bb5b65cf81188b87c2dd2d128bdb7e3