Merge "Fix PullUidProvider unregistering on config update" into rvc-dev am: 7df1a94f am: 364c8e2c Change-Id: I6bcea6daab7bf7c0fc1a5b9e62a310da273eae1f