Merge "DO NO MERGE: Properly relax test to allow platform fix b2457c" into nougat-cts-dev