Merge "Add maxTargetSdk to @UnsupportedAppUsage annotation."
am: 29f955559a

Change-Id: I6ec4d051b19faf7302426c2c78ec728c2be75226