Merge "Version bump to AXA1.230720.021 [core/build_id.mk]" into androidx-navigation-release