Android U Preview 2 GPL (UPP2.230217.004)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: I37d75cf89a5afc73c05d36b9997d950dc94514a7