Merge "Revert "DO NOT MERGE CTS device-side preconditions for MNC"" into marshmallow-cts-dev