Merge "Handle permission check for multi-active SIMs devices."
am: 2638587995

Change-Id: Ibc492399e3b083fe1781eae706ea00416e48429e