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