[automerger skipped] Merge "DO NOT MERGE Restrict showing "new ringtone" for missing picker" into qt-qpr1-dev am: 681ac71f79
am: d582fabd62 -s ours
am skip reason: subject contains skip directive

Change-Id: I6d333e2170bfe8a39f632175a2682e2911b47544