Merge "Add a method to determine if a reboot is required to alter the modem config"
am: 4733dab5a2

Change-Id: I18530094af5d22ca4bc7a0fc9902c45ee87966a8