Merge "Camera: update eviction logic for same owner case" into rvc-dev am:...

Merge "Camera: update eviction logic for same owner case" into rvc-dev am: 6c8d71e9 am: 9f5d5d59 am: f0cf34b6 am: 19724ceb

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

Change-Id: I51443d9aff204fd30a3ad2fb0daf87c0eca28e5c