Added setup/tear down data support am: 09c6189ae4 am: 1049457581 am: ec849ed683

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

Change-Id: Iabce633fe76b7df035d7cbc7e97265040fd4dc80