Merge \"We should registerContentObserver with app\\\'s user id am: e46393e0...
Merge \"We should registerContentObserver with app\\\'s user id am: e46393e0 am: 6d2870fa\" into nyc-mr1-dev-plus-aosp
am: 1652f67d
Change-Id: Ifc0a6758d120d1eef7c16b98cc44ab7f59f3707c