Merge "Fix renaming in device filter" into tm-dev am: a0ca2766 am: 0075b600

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



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