Merge "Fix Docs for KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL" am: 2d78a290d4 am: a636ce731f am: e2dedb294e am: 24b4700df1 am: 047d64b909

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

Change-Id: I29cd1a072e3fcf58d2c380cdb9a205be476e5a77