Merge changes Ifd465fdb,I9b20e21a am: bfb5220ae5 am: 9e5842fe03 am: a18045af3d

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

Change-Id: I9cbc352d8c8635b2f69b6337038ad0819b106d45