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

Change-Id: I35d67a157515e37059478825bfdb2409d420e1c6