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 am: eafb3bf8

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



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