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

Change-Id: I20d62c7fa14424a208901c41e9eefe8c50f5b662