am 080df3f3: Merge "dual-mode switching single/multiuser ServiceWatcher"

# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit '080df3f38fc47f15ad321fff00689dcd07e1d075':
  dual-mode switching single/multiuser ServiceWatcher