Merge "Fix iterator double-advance in ContentObserverController" into nyc-dev
am: 9c2bb6da70

* commit '9c2bb6da700bc2fd64ccf3be04e4130550b95e92':
  Fix iterator double-advance in ContentObserverController

Change-Id: I081d7a6232f4a90b52e9e7fdbe8932c58efa4fc7