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

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



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