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

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

Change-Id: Icf3552d07fcf03b6495dd709c94e59ec35309675