[automerger skipped] Don't inherit tablet-dalvik-heap for GSI and emulator am: 8b266f16a9
am: 44fda3e29e
-s ours am: e69116105b
-s ours
am skip reason: Change-Id I4d1e2f819fe688a4a85e58387b6af58d603399d3 with SHA-1 6ce12029b0
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1344821
Change-Id: I3b1100e816159f043a10a429932fb00d36d603f0
This commit is contained in: