tree 796fb1abf65408f5f7497f0b55a6b74961502620
parent 2ed83a71eeda53a3f5fa49760d8f57886907bfc2
parent 1750ceafb83e01346935548aa9104be91679e61b
author Aaron Huang <huangaaron@google.com> 1620986838 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620986838 +0000

[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