Merge "Update NR TAC limit to 3 bytes" am: 77f906a3f5 am: 45e51ed217

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

Change-Id: Ibba0fbc4d578be3e9bbae823052e3b248e061faa