Merge changes Ifd465fdb,I9b20e21a am: bfb5220ae5

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

Change-Id: I7b3ebc76fd993b5f1fb4596825dc8db18d3a7a98