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

Change-Id: Ia51c6a450757647bb579bd90d08730229765d17a