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

Change-Id: Ia76ff984c6553bb9db47a7a4f82b34aeaa00d0a9