Merge \"Merge \\\"We should registerContentObserver with app\\\'s user id\\\"...
Merge \"Merge \\\"We should registerContentObserver with app\\\'s user id\\\" into nyc-mr1-dev am: 97fc17ce am: 7572ca23\" into nyc-mr1-dev-plus-aosp
am: 2b3b39da
Change-Id: Ibf5f36356dea828d2c04b39854749f412fb20b83