Merge changes I0f07043f,Ib4635ee4,I472ad9f0 into nyc-dev am: 97a46df0
am: b93445dc
* commit 'b93445dc':
Plumb HDR capabilities up to SurfaceComposerClient
HWC2: Add getHdrCapabilities to C++ shim
HWC2: Add getHdrCapabilities stub to adapter
Change-Id: I51c54c4dc562820d40e7b9d331c08398ac02c650