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