[automerger skipped] Merge "Move ApplicationInfo.usesNonSdkApi to private flags" am: fdd378c594 am: de5cc1ff5b
am: 0b62a08c76  -s ours

Change-Id: Ic2ba559d01efac68bc1472b7578772e1488e51bf