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

Change-Id: Iad647ca2e8ef9bec7faf4804fedcd11fe2cbfddb