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

Change-Id: I9dd602dd5cb0e6a5d11f22fd8ffd1b3b6efdf471