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 am: fa76294c am: b3515bd8

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

Change-Id: I8a2681e68e1f252ed3254888d8bf552482464fdd