Merge "Ensure permissions granted for correct SIM" into qt-r1-dev
am: 2b574b01bc

Change-Id: I5e1b53be65abb3b43e548a871fac12a4330e86a2