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

Change-Id: I25f46e60f9b8eae3a6ca57e8cbd8f4d547f56416