Merge "[DO NOT MERGE] Fix failing testSlicedStateCountMetric" into android11-tests-dev