[automerger skipped] Merge "Update redaction upon profile changes" into qt-dev am: 01f94b7cc0 -s ours am: 6c3cdcc7ac -s ours
am skip reason: Change-Id I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b with SHA-1 3736484a0d is in history

Change-Id: I03b39dae42b8b039c731acb49006c77557785531