Merge "Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41 am: 50f9b6e71f" into nyc-mr1-dev-plus-aosp