Merge "Properly parcel HdrCapabilities." into nyc-dev am: 5bddeaa
am: b3324b4

* commit 'b3324b4a2eaf3f2592ca0c377da7cf0bd4f1dc7e':
  Properly parcel HdrCapabilities.

Change-Id: I5ce8026274a04b33bad728f3f17fad6c5579903b