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

[automerger skipped] Merge "Remove @TestApi from @SystemApi symbols" am: d2d46376 am: cbe28234 am: 14897c25 am: 24b4d166 -s ours

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

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

Change-Id: Ic5423c394cfa3e489ec2f6f6d043afdadb19d9e9