Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: 5ff38f7c0d

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

Change-Id: I9aa62677f52ac78916c518d1378a05bda143f676
tree: a174bd87448c1141770c66de4efc9c58415a0f48
  1. core/
  2. services/