Snap for 15012624 from ee9cc78ae24f0f037249f4c160f96ca691c1c336 to 26Q2-release

Change-Id: Ia22e67317662b31ee689ee651f36351fdeec2cd2
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>