Merge "Add extraneous neverallow rule to enforce attribute inclusion." into oc-dev am: b5aeaf6d am: 2f2fd365 am: 04d9f833 Change-Id: I0eaf6ae7cd00f3f53efd2243ffe15a1bb4e97442