[automerger skipped] Merge "Update redaction upon profile changes" into qt-dev am: 01f94b7c -s ours
am skip reason: skipped by user dupin

Change-Id: Iae319dff17a311c919db2f30a194bc9ce737c3eb