Merge "Add a field to ServiceRecord for FGS notification permissions."