Empty merge ab/12770256 into aosp-main-future

Merged-In: I2ae21748ca57967790e7dc3f9664cc34d766ca8b
Change-Id: Ic089893fabb51c34dd7e5b7aa313c474b8745dc8