Merge "Respect system locale in ID3 tag encoding detection" am: 33bba18b2e
am: deaa7218f7

Change-Id: Ia39fd6c42aae3c8b5947cc68658e29ddfbf03441