Merge change 6232

* changes:
  frameworks/base: Update mPdu in createFromPdu