Merge "Fix writeToParcel parameter nullability" am: 55fb62a515

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840533

Change-Id: Ieabc166af0086501cc638cffa7dc6f5960f67172