[automerger skipped] Merge "Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED." am: 811557c5 am: 90729ef1 -s ours
am skip reason: Change-Id I19f96371f426e4e061eb95ad1f0f2c8f5942fd4c with SHA-1 9d52bc77 is in history
Change-Id: I26dee8798813f511a85ab62c0c30496f2f0cb4f0