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

Change-Id: Iead83b500ad5b7fef1b0d8c5e3e92aea10b87bbd