Merge "Adding a file to use for excluding features from aosp" into pi-dev