Merge "Allow android.os.flags to be used by ART." into main