Merge "Apply MainlineTestModuleController to ExtServicesUnitTests" into rvc-dev am: bab2908ffa am: 4d3539544e

Change-Id: Ib2804ea718126a2989c2610a893e8a8a01da9434