Merge "Fix the SingleSource foreach test with LaunchOptions." into nougat-cts-dev am: fb41072d1a am: a6a8b9ce90
am: 06c9aacdc6

Change-Id: I6496ab88e2607ed993e7ce9f0538b6f9d7cc5774