[automerger skipped] Merge "Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED." am: aafea754 am: 0bd1397e -s ours
am skip reason: Change-Id I7c95b175865986901cf50e21b39a35df60ada83e with SHA-1 4b3693e9 is in history
Change-Id: Icf493a87e7aa42cf9ae0bb894861e0cd3f9b2314