Android U QPR2 Beta 3 GPL (AP11.231215.007)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: I5553d2b8058ed66bc38776e38a326bb42305aa82