Merge "Reword ambiguous documentation in Parcel" am: c2bd9f48 am: 231c243d

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



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