Merge "Merge "MediaFrameworkTest: Fix storage path" into qt-dev am: e83c7779c0 am: 105f6f68f8" into qt-r1-dev-plus-aosp
am: a744aa0c13

Change-Id: Ie7b1ba3523c8fe3a0189234fc2c928f0d54eab02