Merge "Merge "Remove failure check for NV21" into marshmallow-cts-dev am: 8493b7c189" into nougat-cts-dev