Change ContentObserver for Account; fix two bugs

* Fixes 2085862 and 2087385

Change-Id: I38e046e861ec0423669506194c0bcd6c9c96328c
1 file changed