[automerger skipped] Merge "Allow Android to function in single SIM mode when...
[automerger skipped] Merge "Allow Android to function in single SIM mode when modem is in DSDS" am: 0f3c1d55 am: 2aea6e04
am: 73649faf -s ours
am skip reason: change_id I073840a10ff8b3c77160f83279aeb9b6650d05e0 with SHA1 eab58cdd is in history
Change-Id: I04cf665dbac6f149e19457eedac3ab8581ddf71c