Merge changes from topic "removeNI" am: 53cde33c97 am: 3a64840b51 am: 4f45d48a11

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3553ff41d85f44c481ea065e6cbda5d286f9e1fa
tree: daf25e1a83e45f9382afe0b6294b7e4e8641d173
  1. core/
  2. services/