Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests"
am: 74ebf7a282

Change-Id: I355094c08249d0f393acdafd5aeeea73de8b0b0f