[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter...

[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e2 am: 268575fb am: c45030ba -s ours am: d4a01ee0 -s ours am: 9d5bbc8e -s ours

am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247



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