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: I8875d98f0c895bdec72c42e55e7c5dd6927c57c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>