Merge "Merge "MediaFrameworkTest: Fix storage path" into qt-dev am: e83c7779 am: 105f6f68" into qt-r1-dev-plus-aosp