[automerger skipped] Merge "Update NR TAC limit to 3 bytes" into rvc-qpr-dev...

[automerger skipped] Merge "Update NR TAC limit to 3 bytes" into rvc-qpr-dev am: be05cd4b am: 8e137b92 -s ours

am skip reason: Change-Id Ie007c29671da709f23684ff27d30ef1c377aadc6 with SHA-1 291ec13f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12367462

Change-Id: I862b3e5773ea638d1051be7ea36370928582862f