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

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

Change-Id: I8d665456425127c9845ae8ae03995ad4254e8457