[automerger skipped] Merge "Only allow SMS disambig dialog for foreground...
[automerger skipped] Merge "Only allow SMS disambig dialog for foreground activities" am: 44006817
am: 4636752f -s ours
am skip reason: change_id Ie24416fcc07a7027bca715af65604601c418e787 with SHA1 16a1bd92 is in history
Change-Id: I1b4877905c20fe52a3c0f5070f275bd3e13499c2