Merge changes I6136a2a1,Ibc0bd88e,If4f7a1f7 am: d842401e6a am: 7b2b33c257 am: 76cecfc7ed

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

Change-Id: I15d29c61ed98fd41415e859ee21a89e7f8eef6f3