Merge "Add explicit exported tags" into stage-aosp-master