Merge commit '898004c4b2322c8fece08944731eed9fc08a14a5' into gingerbread-plus-aosp * commit '898004c4b2322c8fece08944731eed9fc08a14a5': Activity/provider used is restricted to the application's Package, but can be spread across other packages as well.