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