Merge "Update redaction upon profile changes" into qt-qpr1-dev-plus-aosp