am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"

* commit 'a3db5297cda370ce41db99b6839cd9528c31ef7c':
  ProviderMap: remove hashmap when entire user specific entries are removed