Merge "callingUid needs to be passed from AMS to DeviceIdleController." into sc-dev