Merge "Revert^2 "Update D8 and R8 to 8.3.17-dev"" into main am: 332b4f0447 am: 49ad8361e5 am: c72151b7c9

Original change: https://android-review.googlesource.com/c/platform/prebuilts/r8/+/2839043

Change-Id: I35e4aa8769f37f584eb0f60d6ebd263819c427c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>