Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" am: af0e1c2fa5
am: f2cc6790f9

Change-Id: I2251db66ef73d5b69c84b4e83f2788d2bc953eda
tree: bd32cb53ef80bd2e7d8cfda22275817279590f65
  1. framework/
  2. OWNERS