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

Change-Id: I8b997f0d58915bda34399cd16faad41b7a69b4d9