[automerger skipped] Merge "SDK API doesSwitchModemConfigTriggerReboot" am: 1953ea490f -s ours am: c898d8096a -s ours
am: 11d9ed1c2b -s ours
am skip reason: change_id If03e376ad0e91ad69f8444567700ed3fe76d66f6 with SHA1 c320f2cb37 is in history

Change-Id: I6bca2fd23cf38e79fcdd131d692ebe2ca4413c45