Merge "Fix writeToParcel parameter nullability" am: 55fb62a515 am: 182a0a144e

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

Change-Id: Id0ce4059b6f9e05a335a117c2cc3947adb24d27a