Merge "Using base intent to check the calling app instead of uid. (Bug 15940115)"