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

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

Change-Id: Iafb7918b7d60a5c3483bcb545b9e6d3be1ef00dc