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

Change-Id: I7ad35696292ea3a05236addc50281097f61adb38