RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6 am: bccb8bec0a

Change-Id: Id6995c02dc69230eab7cd1d312c4c4d569e44a25