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: 8f4e32f9 am: 062a24e0 am: 01f39050

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

Change-Id: Ib71cab3baa15283d77536e050cf80242b5cf0ac6