[automerger skipped] Merge "Don't register NLS in test" into main am: 397dfb6e02 am: 26e9cd615a -s ours

am skip reason: Merged-In Id19eb4a50008640e9a7ca556fd332f3fca8688ba with SHA-1 30781abdf3 is already in history

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

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