Revert "Camera2: Don't try to cancel focus messages when preview stops"

This reverts commit 7c9742c6af99b5a395fe8b8a2d99e3f9676aa808.

Change-Id: Icf8f4024c92537e1fde1e17191196135e28cbf9a