DO NOT MERGE ANYWHERE - Update lollipop-dev to use main branch. Bug: b/289400079 Change-Id: Iac52c7b82460b5d2139c0a3e4375cd61d5a222bb