[automerger skipped] Merge "Re-order parameters of setUiccApplicationsEnabled." into rvc-dev am: 8972b83893 am: 74c35c358a am: 787458a9ba am: caa9ef17e3 -s ours
am skip reason: Change-Id I1d4a2bf7dfc01842f583e02517986a8bf043bfde with SHA-1 80659815c3 is in history
Change-Id: Iedd1ff3ced7f84a1dc2a3e21471f833983093804
This commit is contained in: