Merge "Fix ParcelNullabilityTest." into stage-aosp-master