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

Change-Id: I170da6d29b091be96f6efc652ba1f00a6fbd2dc5