Test: ./gradlew connectedAndroidTest Bug: 74435529 Change-Id: I22e3abe8dce0663a7d1e7ee3050d327abeec4ad2 (cherry picked from commit c38af2fb)