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

Change-Id: I0498bdefc05aad2b56c68f586e480d06b9fe80c1
tree: e6c41993e05f3462f58ecfdb4f704b0bb80a8acf
  1. framework/
  2. OsuLogin/
  3. OWNERS