Merge "Merge "Skipping testOpportunisticScan" into nougat-cts-dev am: 75bca5549b" into nougat-mr1-cts-dev