[automerger skipped] Have test_current be a union of system and test APIs am: b7a4938caf -s ours

am skip reason: Change-Id I23d3c88624ee7599485c3390a0440b78bc18a0a2 with SHA-1 a2b349773a is in history

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

Change-Id: I9e61df3e485f622b514782930afccc99b8c4a863