Fix ProguardMap line mapping am: cdac020aa2 am: 2684e86287 am: cc6759cbaf

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

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