Merge "Fix PullUidProvider unregistering on config update" into rvc-dev am: 7df1a94f am: 94fefce9 am: 9479404b Change-Id: I51fb992a01f560f9330499eb9deb61a0fa9942fa