Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: 27d2960c50

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I9aa62677f52ac78916c518d1378a05bda143f676