[automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: 5ff38f7c0d am: 1750ceafb8 -s ours

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

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

Change-Id: I39709941a1770435d9a2e221025b46eed5d32ea0
tree: 796fb1abf65408f5f7497f0b55a6b74961502620
  1. core/
  2. services/