Merge "Added NOT_METERED to mutable capabilities" into tm-dev am: 5ecb8b7d...

Merge "Added NOT_METERED to mutable capabilities" into tm-dev am: 5ecb8b7d am: 0d7b4cb0 am: 81695df6

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



Change-Id: I2b7f560f3157ca7c117438c28edf510d6700505a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>