Merge "Don't require T to extend Parcelable or Serializable in Parcel" am: 6a2f196dca am: 425b8699bb

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

Change-Id: Ib68ac2d8097282793bbf5a687721aedac498bfe5