[automerger skipped] Merge "Update NR TAC limit to 3 bytes" am: 77f906a3 am: 45e51ed2 am: 57674889 am: 92022936 -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: I8fa18aaa6eb185d6d771c57778bcc821f7971680