Bug: 238263999 Test: N/A Ignore-AOSP-First: Change was only merged in master Change-Id: If1c13460deecb8bdd9b00a8922823dc33b02c202