Merge "Merge "Update JavaDoc to replace deprecated Parcel read APIs." am: 06ee57cda1" into stage-aosp-master am: 5eb36db920

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

Change-Id: Ia20487d04b0e0a6858516ac2508da9310d4c2a0c