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

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

Change-Id: I99adbcf35a246e819b317460bd69be5bb305807a