[automerger skipped] Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" am: af0e1c2fa5 am: 963172ac83
am: d4f9f9f666  -s ours

Change-Id: I1e0c087f4f5dd08a607aae0ac08fac47ee12bfeb