Merge "Include "usesNonSdkApi" in dumpsys."