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

Change-Id: I07d33f34b8cc38c7da89ba60b73bb1116642c04f