Android U Beta 1 GPL
Merge TQ2A.230405.003

Bug: 271343657
Merged-In: Ic2c3014cecfd5db84dc2023b4c247d96ad1c3414
Change-Id: Ica104f83c124f16b73a433784893d77cbb12f632