Merge changes from topic "removeNI" am: c2d6240642 am: bd414490cb am: 4bd67ddfa9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3553ff41d85f44c481ea065e6cbda5d286f9e1fa