Merge "Parcel.java: Fix bug where non-nested creators threw NullPointer" am:...

Merge "Parcel.java: Fix bug where non-nested creators threw NullPointer" am: 97211945 am: 715e4176

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



Change-Id: I5b2d68cebbff65183c9c854d43bd1da817fe8eea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>