Merge "Add new config_sms_ask_every_time_support" am: 3587fde8 am:...

Merge "Add new config_sms_ask_every_time_support" am: 3587fde8 am: 05cd4c33 am: a843fe9c am: 1f8fbc81

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

Change-Id: I749120d38a318c8e5d9beba3d425caf897ed38d0