Merge "Merge "DO NOT MERGE Add comment for false-negative test on emulator" into nougat-cts-dev am: 2272d2697c  -s ours" into nougat-mr1-cts-dev