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

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