Merge changes from topic "remove_legacy_NA" am: 71ab824707 am: a698a47ada

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87cc62579b19699438704f472fc754837d878038
tree: edff7852b947979742784255f1ccd9919c512441
  1. core/
  2. services/
  3. tests/