[automerger skipped] Merge "Switch dynamic not metered to temp not metered"...

[automerger skipped] Merge "Switch dynamic not metered to temp not metered" am: 27c35d19 am: 5a00500b -s ours

am skip reason: Change-Id I144b0f9af1765c8ada578adc67dd4a55811b10eb with SHA-1 8e3215ee is in history

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

Change-Id: I21c82f504af2bddc805415d6e69ff493fd776867