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

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

Change-Id: I41f052ee446387000baaa953f0a94c9e3a75dfaf