Merge "Move @hide and @SystemApi to <public> tag"