Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41 am: 50f9b6e71f
am: 0eb99d23b4

Change-Id: Ie8dbed22423aa52b418cebfd19e29c6ae2c6e2b5