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