Merge "Move ApplicationInfo.usesNonSdkApi to private flags"