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

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

Change-Id: I7e51e18549bf7164b362752738e3bc1e9da32c10