Merge "Fix issue #5253941: ICS ignoring provider's android:process flag"