Merge "Revert^2 "Use vendor api level instead of sdk version"" into main