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

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

Change-Id: I7ff844cac42f7734b27f3f84a68999ea3a6e864c