Prevent OOB error for T2T read/writes Bug: 112161557 Test: Tag reading, HCE Merged-In: If170e107b172a590b53f916b12865a1839a25667 Change-Id: If170e107b172a590b53f916b12865a1839a25667 (cherry picked from commit 783bc0052f02c8672fe0b57d1cf94735e2a816c0)