Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test

(cherry picked from commit c52b8ce9)

Change-Id: I966b9d02b756c8bccaea3aa58bd1b62aada7f45c