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

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

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



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