Merge "Add extraneous neverallow rule to enforce attribute inclusion." into oc-dev am: b5aeaf6d am: 6f94efaf am: 3b2bf73d Change-Id: I666e91ca83ad916b04c325d4f75570d550fc0c61