[automerger skipped] Merge "Refactor NativeHeapTagging compat feature." am: 077e78a71f am: 79b70781fd am: 9048380d4d -s ours
am skip reason: skipped by user eugenis

Change-Id: I85f3a2821b9822c3de0b52872639ec7381e7192d