Merge "Version bump to AXG8.210822.006 [core/build_id.mk]" into androidx-wear-wear-phone-interactions-release