[automerger skipped] Merge "Notify user to select back to global mode while no...
[automerger skipped] Merge "Notify user to select back to global mode while no service." am: 91d5bf9f -s ours
am: 4e99fc05 -s ours
Change-Id: Id83422fed1c55dc844aa2e73e111c1b211033532