Merge changes If936afa1,I3df8a1e8 am: eea13742e8 am: bb4f436fc3

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

Change-Id: Id2a22a89cf21e98377ba764a2e34ae39709e26a0