[automerger skipped] Merge "ParcelFileDescriptorTest: fix PFD creation." am: 527dc53054 am: 0c4bb00a86
am: 4957e90bc8 -s ours
am skip reason: change_id Ibf73c23d16174582a9a363f7b8fbe84e1230a4ae with SHA1 58a22d112e is in history

Change-Id: I443d8184ec0393cd5c09e1be5436b6c3901593b7