Merge changes I86ba4225,I04d8e19a into main

* changes:
  ExternalCameraHAL: fix CTS failures with callback for errors
  ExternalCameraHAL: improve buffer and error handling