Merge "Allow the unsupportedappusage-annotation to be used for device variants" am: a1df2cb009
am: e6970c06d7

Change-Id: Ibf6f3c3895602d332b2a021bccbdab1846ec73b4