Merge changes from topic "removeNI" am: c60c7b4df8 am: c62d1e3b0c am: ecac1d2479

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3553ff41d85f44c481ea065e6cbda5d286f9e1fa
tree: 81384f6abe4442708ca921b8bdd6b53f12c6f53c
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS