Merge "Fix cts fail for android.autofillservice.cts.augmented" into rvc-dev