Merge "Fix ParcelNullabilityTest." into stage-aosp-master
am: dc6a23bab9

Change-Id: I1947283d25646717d2543493d7569848e09a7650