Merge "Marking SoftApCallback methods as SystemAPI"
am: 8295ffc5af

Change-Id: I9cb5c54a206f9e92a321fa438640329c1f8f8a60
tree: 9e97be2c0b02447162bf391d86429a063dcdf003
  1. framework/
  2. OsuLogin/
  3. OWNERS