[automerger skipped] Merge "Exclude default APN from unmetered bypassing check" am: 91acc21e am: e3675b88 -s ours am: c9ce5944 -s ours am: 84cdebac -s ours am: a26defa4 -s ours

am skip reason: Change-Id If2cd5474ff356b3de0cc4e567eead4535c31c76a with SHA-1 3ca59af9 is in history

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

Change-Id: I4b57305f0490f2699152d61632a56c4219d9e6ed