Fix merge of "Upgrade Cuttlefish GSI's PRODUCT_SHIPPING_API_LEVEL"

When Ibf6f27567296b1d05d3098232818ee5ae69d4a2d ("Upgrade Cuttlefish
GSI's PRODUCT_SHIPPING_API_LEVEL") was pulled in from master, it
fixed a bug that was already fixed on master-cuttlefish-testing, and
the duplicate fix will fail to build once this is merge back onto
master.

Bug: 120646021
Change-Id: I71c4e531dd77a0de4ef9f048feb418a4bcd87feb
1 file changed