Merge changes If936afa1,I3df8a1e8 am: eea13742e8 am: bb4f436fc3 am: 0b3a9bf202

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

Change-Id: I46a24296f10916f8411f2acc8911753b8b566225