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

Change-Id: Ibc7b687b904092af051f25f89ff76bcf820cbdc8