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