Merge "Replace targetSDK check with platform compat framework gating."