Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66 am: 62a0566244 am: be2826e8dc

Change-Id: I18e07c3ae09432469b8a3a8804b40c76676b64c0