GitLab

In case new renamed policy has lower priority (for example it's the
enterprise default value) and the old policy is set -- the old value
should be used.
Also modified a policy->pref mapping test.
The issue was introduced in crrev.com/c/2507771

Bug: 1151109, 1138572
Change-Id: I3fae90729a8aad1fbc946017b1f7a5134b727826
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2555058
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830589}