Merge "Demote InfiniteRecursion to a warning" into main am: e04b965cb1 am: 1e870bcbf4 am: a4d1b248ee

Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2829589

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