[automerger skipped] Don't inherit tablet-dalvik-heap for GSI and emulator am:...

[automerger skipped] Don't inherit tablet-dalvik-heap for GSI and emulator am: 6ce12029 am: 1e71f9bd am: 25558cd3 -s ours

am skip reason: Change-Id I4d1e2f819fe688a4a85e58387b6af58d603399d3 with SHA-1 9f2f6dd9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12042307

Change-Id: I436331070708f6439eafe17bf52fdaa9a98709e7