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

Change-Id: If49a4f7bfdc49d65214c54ab452a50c3ccb61c5b