Merge "fix(#Magnification): mis-use non resoure id in resource getter when...

Merge "fix(#Magnification): mis-use non resoure id in resource getter when magnification capability setup" am: 085797df am: 7a558ab9 am: 8a64ee2b am: 1f4e37ea

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



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