Merge "Fix the capability list for reduced feature set devices." into sc-dev...

Merge "Fix the capability list for reduced feature set devices." into sc-dev am: d2ad2033 am: ea31a4bf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/14987005

Change-Id: I9669bf571ff7f73a2e27179ffe48aab7b831f861