Merge "cameraserver: Correct camera1 -> api2 shim layer handling for video stabilization." am: 15d5df069a am: 8840ce6d67 am: 4c440acce8

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

Change-Id: I0358c2b1b76c3f4ba17e994525fee690135b504d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>