[automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: 666aa69090 am: 902c1df2d7 am: c2d39cdac4 -s ours am: 319b0be3ed -s ours
am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 aa601c3bf1 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585
Change-Id: I5b28120863044fb544a7b9377ebe33d233c7fd51
This commit is contained in: