Merge "Merge "Properly parcel HdrCapabilities." into nyc-dev am: 5bddeaa am: ee1bb34" into nyc-mr1-dev-plus-aosp