Merge "Camera: update eviction logic for same owner case" into rvc-dev am: 6c8d71e958 am: 8f4e32f97e

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

Change-Id: Iacdd593b703374a6da3ac473a1196fc72961c2b7