[automerger skipped] Merge "s/enforece/enforce/" am: 6919d233 am: db51607d...

[automerger skipped] Merge "s/enforece/enforce/" am: 6919d233 am: db51607d am: 803eeaac -s ours am: 7daf2b39 -s ours

am skip reason: skip tag Change-Id I63876270f943ed92138b4b96ff720baf40a38868 with SHA-1 989da426 is already in history

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

Change-Id: I6c4e232c02a431ed0f41d849baf8097b0883d01d