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