Merge "Make QuickExceptionHandler handle force-retry-instruction"
am: 6071d2d1cd

Change-Id: I263d5c5fb75bec082ed7c0bec03ba091241540d1