[automerger skipped] Inverted the new data stack flag am: 64b6709e am:...

[automerger skipped] Inverted the new data stack flag am: 64b6709e am: c3f1e9af -s ours am: b412219a -s ours am: 2cfa1e30 -s ours

am skip reason: Merged-In I75737c0ef9bce91385f815133e1878e5abea68ff with SHA-1 ad2b8f2e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089544



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