Merge "Add explicit exported tags" into sc-dev-plus-aosp