Merge "DO NOT MERGE Add comment for false-negative test on emulator" into nougat-cts-dev