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

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

Change-Id: If85e19bdb4878bbedfa5828a9c73255ec19b5e5d