Merge "Add feature flag for HWC2"
am: 51af54dea4

Change-Id: I4919553078bfd7c9e2e4e610a74d7d4d8a6c46c7