Merge "Merge "Remove trust agents test if platform has none." into marshmallow-cts-dev am: ed0766b6ad" into nougat-cts-dev