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

* commit 'bcb402b2108a3dcf43d5753b9d68dc831a54b743':

Change-Id: I19e1b945c74385eab7acb80a716956f98fa3bc9c