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 am: d74c99a0 am: 5005c4a9 am: 48e0ac13

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



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