[automerger skipped] Added NOT_METERED to mutable capabilities am: f3cad7af...

[automerger skipped] Added NOT_METERED to mutable capabilities am: f3cad7af am: af526628 -s ours am: 1d50593b -s ours am: bd7b3217 -s ours am: 86baddcc -s ours

am skip reason: Merged-In Icf8e5744ffaa7b330d9b7c7332b80abd8bde91a6 with SHA-1 9750e6ed is already in history

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



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