am ef20147e: Merge branch \'lmp-mr1-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev
automerge: 3b3b378

* commit '3b3b378d93bf57db79f0f3b77f79ee201719e9d2':
  Remove SystemApi annotations.