Merge "Fix Docs for KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL" am: 2d78a290d4 am: a636ce731f

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

Change-Id: I10b4492decf398234c6feff0d46f07ab9d41d7c9