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

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

Change-Id: Ieee671c4fb41f05bd5c4475cf187d8797dea7e67