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

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



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