Added setup/tear down data support am: 09c6189ae4

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

Change-Id: Iaca33603e8d3fe7bd7411ce2c3bee5cdc19cd149