fix a surface leak introduced by a failed merge (DO NOT MERGE)

Bug: 4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
1 file changed