Merge changes from topic "remove_legacy_NA" am: 362fc1ca1f am: c65281e9c4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87cc62579b19699438704f472fc754837d878038