Resolve conflict in naming of ahat module and file am: 196d4674dc am: 4075ae5736

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

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