Merge "Change registerContentObserverForAllUsers to registerContentObserverAsUser"