am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"

* commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
  frameworks/base: Destroy the overlay even if there is an error