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

Change-Id: I7ad2c8c038887bdd9e54773caed2bf18db61dde7