Merge "Correctly serialize class loader context for "any" SDK version to JSON." am: 1b60bb4f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077659



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