[automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: 27d2960c50 am: 06e89d6c3b -s ours

am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 a10cc3aa60 is already in history

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

Change-Id: I39709941a1770435d9a2e221025b46eed5d32ea0