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

Change-Id: I9745b9f0f7a36ec823a83d0267181045d83b27bd