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

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



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