Merge "Use correct filter" into udc-dev am: cf440dca am: 860002b4 am: cdbf2167 am: 4b5343c2

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



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