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

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



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