Merge "Clear calling identity before calling into AMS" into sc-dev