Merge "Have test_current be a union of system and test APIs" am: ae26decc8e am: e25f19221f am: 961bddd3f8

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

Change-Id: I07090e61f12381964eb555bba2b5d10b2c58095c