Merge "Apply package visibility to cached ServiceRecord" into sc-dev