Merge "Add @SystemApi registerContentObserverForAllUsers in ContentResolver"