[automerger skipped] Merge "Re-order parameters of setUiccApplicationsEnabled." into rvc-dev am: 8972b83893 am: e576678a0a -s ours am: b514e1b4ce -s ours
am skip reason: Change-Id I1d4a2bf7dfc01842f583e02517986a8bf043bfde with SHA-1 f0af4a6995 is in history
Change-Id: I4752aae7bba027bf8d9c19019578ac21ff313329
This commit is contained in: