Merge "Merge "Fixes external storage path for SensorCtsHelper getSensorTestDirectory()" into pie-cts-dev am: 733fb3ce"