Merge "DO NOT MERGE Restrict showing "new ringtone" for missing picker" into qt-qpr1-dev
am: 681ac71f79

Change-Id: I7b7a3b12dc9d2ce2b49a1e61a7ba4364b39573fc