Merge changes I6136a2a1,Ibc0bd88e,If4f7a1f7 am: d842401e6a

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

Change-Id: Icfc6a2b71bacb31c6e41ebfc68660e62ace07dbd