Merge "Move PersistentIntentResolvingTest to DeviceAndProfileOwner" into mnc-dev