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

Change-Id: Ic0fca09f12ddc5793e4946359258a24ea1047050