[automerger skipped] Merge "Re-order parameters of setUiccApplicationsEnabled." am: deb27cc3 am: 0520203a -s ours
am skip reason: Change-Id I1d4a2bf7dfc01842f583e02517986a8bf043bfde with SHA-1 f0af4a69 is in history
Change-Id: I580804c38e767aae688096c8fd5a0fea35d844ab