[automerger skipped] Merge "Update NR TAC limit to 3 bytes" am: 77f906a3 am:...

[automerger skipped] Merge "Update NR TAC limit to 3 bytes" am: 77f906a3 am: 45e51ed2 am: 57674889 am: 92022936 -s ours am: 2754bcd4 -s ours

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

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

Change-Id: Ia6b1e6284e919149f2ad090c36a53f025639c3ab