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

Change-Id: Ice2ed7b89ec91bcb1ecbad412beee15308ec49cb