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

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

Change-Id: If8542ca7a0e98f13d4e1e95f01c3bc99370e9493