Merge "Added aconfig flag for updatable TextClassifier OTP detection" into main