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

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

Change-Id: I26402f26556f693ab54f164e6dab89bc4796d53b