Bug: 323940469 Test: run locally Ignore-AOSP-First: local changes first Change-Id: Ia27924a01433e613496e9a624f93d385a08678a3