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

Change-Id: I6dbd8fb7cc44ae8b5161cacc7c581a0c2952c9be