Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev