[automerger skipped] Merge "Remove @TestApi from @SystemApi symbols" am: 49ca9d3ca9 am: cbe282347e am: 9cd59a3529 am: 14ea2ab355 -s ours
am skip reason: Change-Id I772790b783b0a8730b8bf680c9e569a886b8d789 with SHA-1 71bd86ed3d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: Ic5423c394cfa3e489ec2f6f6d043afdadb19d9e9
This commit is contained in: