[automerger skipped] Merge "Update redaction upon profile changes" into qt-qpr1-dev-plus-aosp am: 7f26053615 -s ours
am skip reason: Change-Id I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b with SHA-1 28790c0152 is in history

Change-Id: I2664e09e2f7800467aba1e16d92e62b2089ef2d3