Merge changes I9ce48ec4,I16844f82 am: b3d800c52c am: 327647cfbe am: 6f2ff823e0

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

Change-Id: I18762a06b17578ef989643d054dc785be0197a6f