Merge "noop: change from deprecated __ANDROID_API_U__ to 34" into main