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

Change-Id: I3c5ec1e9a177a15144e7ddeb0caa0a1dadbfb740