[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 219079c50b
am: ccce5d5dd5
-s ours
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I6601c8fecf33dcd903d5533872181edb4c1fff6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: