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

Change-Id: Ied8f6ef53a701547f4c921e3b401838c5facf205