Fix class-after-object map creation logic am: 80cd10dc86 am: 3da089a09b

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

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