Merge "Support for maxTargetSdk on @UnsupportedAppUsage."
am: 20893eef2f

Change-Id: Ib3bdd4ca8098a582307e8657197a58883a3016f3