Merge "Don't register NLS in test" into main am: 397dfb6e02

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

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