[automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: f2810586...

[automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: f2810586 am: 27d2960c am: 06e89d6c -s ours am: a9d2d9a8 -s ours

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

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

Change-Id: I9a0fba78ab81fa293bd8f45e69078b0cb678106c