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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9cd6ce929a7103d2d6b7195a71ee64ea0a4ee0a