Merge changes from topic "removeNI" am: c60c7b4df8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7c6e3bf8f10b98fc2c4d83d41e65c64737753f0
tree: e07dda6ca52d8863a4e3056baa7b16445081a89d
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS