Merge "Define an order for the media source list" into pi-car-dev
am: ed81f6fff0

Change-Id: I13f637d8b9b165c6377afd2388e2a9b94f6ddbc4