Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e

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

Change-Id: I86daec690141893837ec58ab1d75aecc88557ff9