Merge "Rename *Iface* APIs to *Interface*" am: 666aa69090 am: 902c1df2d7

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

Change-Id: I9aa62677f52ac78916c518d1378a05bda143f676