DO NOT MERGE Restrict showing "new ringtone" for missing picker
am: 181b7769cf

Change-Id: I9ce07543a844c2678fb4be50f0191f1169616066