Merge "Merge "CameraService: Consider pids before priority when evicting a...

Merge "Merge "CameraService: Consider pids before priority when evicting a client." into tm-dev am: e1c25ccd am: 15da1158" into tm-d1-dev-plus-aosp am: 070ab057

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



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