[automerger skipped] Revert "Fix EapFailureNotifier failing to resolve resource name dynamically" am: 8837c5f3d6 -s ours

am skip reason: Change-Id I14eb2af7d75d73ff4dc0c05bba069afb90806e89 with SHA-1 87c2839c39 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12865306

Change-Id: I0331911c193ffa7899dd4681f49a78e714f0a0ed
tree: cfb897f4bbbde70916f0d7b9aa0024335ba96e3b
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg