Merge "Remove @TestApi from @SystemApi symbols" am: 5cedf5097c am: cbe282347e

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

Change-Id: I86daec690141893837ec58ab1d75aecc88557ff9
tree: 8f74cae697fd95f78a97b7a46ea5045953bfbb02
  1. core/
  2. packages/
  3. services/
  4. wifi/