Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev am: 106dc34fb2
am: 5d5d865dc8

Change-Id: If49e70eb961731a2bb5b8ecb5313fd52346612db