[automerger skipped] Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev am: e3ff000ca5
am: 62988d3ba7 -s ours
am skip reason: change_id Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3 with SHA1 a7c66bd145 is in history

Change-Id: I3c5ec1e9a177a15144e7ddeb0caa0a1dadbfb740
tree: 0ed4b0ffb81580603672f63e53f9fabc1ca7dca2
  1. framework/
  2. OsuLogin/
  3. OWNERS