Merge "Remove duplicated path scaling of camera protection and scanning rim."...

Merge "Remove duplicated path scaling of camera protection and scanning rim." into tm-qpr-dev am: ec30c5a9

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



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