Merge "Adding FeatureFlags.java file to aggregate various feature definitions"...
Merge "Adding FeatureFlags.java file to aggregate various feature definitions" into ub-launcher3-burnaby-polish
am: f3b13b55
* commit 'f3b13b55':
Adding FeatureFlags.java file to aggregate various feature definitions