Merge changes from topic "removeNI" am: 5e1ec81e2f am: ecb34129dc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec45cb7f553f08e4e3ec91827964a8eec8f96a91
tree: d4e1c2fcbd6416f37e6b6a37eaf682a6f9bafb0d
  1. core/
  2. services/