[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: 8b266f16 am: 44fda3e2 -s ours am: e6911610 -s ours am: d5b94225 -s ours

am skip reason: Change-Id I4d1e2f819fe688a4a85e58387b6af58d603399d3 with SHA-1 6ce12029 is in history

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

Change-Id: I2b1e68f5d350da0ada47923cd0e0b1316e42a73f