Merge "Hidden ApplicationInfo flags are now in privateFlags."