[automerger skipped] Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" am: af0e1c2fa5 am: f2cc6790f9
am: 63901c7f10  -s ours

Change-Id: I1e0c087f4f5dd08a607aae0ac08fac47ee12bfeb
tree: 044fae4458a8f6c37a29c8ba03c93f31bfdf4d89
  1. framework/
  2. OsuLogin/
  3. OWNERS