Merge "DO NOT MERGE registerSoftApCallback Executor param" am: db46c349d8 am: 558414e2e0

Change-Id: If47309e800316b78b471c04529fd7ab24d7f72e6
tree: bd5dc3689b85da72758f40199b65a75ce5e1e638
  1. framework/
  2. OsuLogin/
  3. OWNERS