Merge "Add feature flag for HWC2" am: 51af54dea4 am: 05e5589c0f
am: ba9534e74c

Change-Id: Ie10e2d346a170d4993894be1fbe5c36b3c19c93b