[jdk17u-dev] RFR: 8337998: CompletionFailure in getEnclosingType attaching type annotations

[Liam Miller-Cushon]

This is a backport of [JDK-8337998](https://bugs.openjdk.org/browse/JDK-8337998), which is a follow-up to [JDK-8341779](https://bugs.openjdk.org/browse/JDK-8341779).

-------------

Depends on: https://git.openjdk.org/jdk17u-dev/pull/4149

Commit messages:
 - Backport c40e6ef3dcb25b8acc156aa4051694322bf7e351
 - Fix merge
 - Backport 8d0831478338e9b084b2c47f46eba9faae3a5eb6

Changes: https://git.openjdk.org/jdk17u-dev/pull/4150/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk17u-dev&pr=4150&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8337998
  Stats: 225 lines in 5 files changed: 138 ins; 44 del; 43 mod
  Patch: https://git.openjdk.org/jdk17u-dev/pull/4150.diff
  Fetch: git fetch https://git.openjdk.org/jdk17u-dev.git pull/4150/head:pull/4150

PR: https://git.openjdk.org/jdk17u-dev/pull/4150