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

* commit 'ee1bb344d7ad362646428ede48f2e99449275b1c':
  Properly parcel HdrCapabilities.

Change-Id: Ide481e792a93d7a7841085c69bcd9d24f82c1f1c