Merge "Use android.compat.annotation.UnsupportedAppUsage everywhere."
am: cab872d58d

Change-Id: I061e190c2f7e7664fc029d01db4c862dc8e95ef9