[automerger skipped] Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" am: af0e1c2fa5 am: ee2ba33204
am: a58161f70f -s ours
Change-Id: I1e0c087f4f5dd08a607aae0ac08fac47ee12bfeb
This commit is contained in: