Merge "Add new config_sms_ask_every_time_support" am: 3587fde833 am: 05cd4c3313

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456119

Change-Id: I8a18a9aa80dc932f550849ca91f2d21095892b41