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