Merge "Allow the unsupportedappusage-annotation to be used for device variants"