[automerger skipped] DO NOT MERGE Restrict showing "new ringtone" for missing picker am: 181b7769cf
am: 9b02594424 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib205614ea39c823b9e744c30efe7f8d5d5428c6b