[automerger skipped] Fix class-after-object map creation logic am: ec75beef5c -s ours

am skip reason: Merged-In I9606be82a073f0b8315d425652ddaa8b8c2f56f1 with SHA-1 80cd10dc86 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/20811087

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