Merge "Improve @UnsupportedAppUsage docs."
am: 71e365023e

Change-Id: Ide03dec76cdc67cc772378c0d4f0f08e5ae5d9c2