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

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

Change-Id: I19a572cd3767746546c7f5c02bbb3b1d9481303a