Merge changes from topic "T5T_SYSTEM_INFO" into main am: 0b003cb6f4

Original change: https://android-review.googlesource.com/c/platform/system/nfc/+/2793153

Change-Id: I1424de2ef7bd6a0f097b8c543b2f2d307dff8583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>