Merge "Avoid hardcoding /storage/emulated/0 in memory metrics test." am: 71a47642ed am: 42ba4e7941 am: e3ad5574f9

Change-Id: If32d2d03e75120fd6ff99cfec809641448649f39