Merge "Add maxTargetSDK equals P for UnsupportedAppUsage of sCached"