Merge "UidObserverController: Protect mValidateUids with mLock" into main