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

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

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



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