[automerger skipped] Merge "Remove @TestApi from @SystemApi symbols" into...

[automerger skipped] Merge "Remove @TestApi from @SystemApi symbols" into mainline-prod am: 0bace0cd -s ours

am skip reason: Change-Id I772790b783b0a8730b8bf680c9e569a886b8d789 with SHA-1 586a3cf2 is in history

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

Change-Id: I64743a9f2f8b9ba6afd5da61e8c5ce67bb1fd3cf