Bug: 253772249 Test: Gradle Sync Test: Run Gallery Change-Id: Ice8d664f3023cab01485bb5f7045312e60aeb4bb