[automerger skipped] Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66 am: 62a0566244 am: be2826e8dc am: 6afb28c9c8 -s ours
am skip reason: subject contains skip directive

Change-Id: I3c2db025f4cfff9ca833a99e9f1c44cf841ad4b7