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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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