[automerger skipped] Added setup/tear down data support am: 6eb9d8ab am:...

[automerger skipped] Added setup/tear down data support am: 6eb9d8ab am: 01476831 -s ours am: 20b8a2b2 -s ours

am skip reason: Merged-In I3fe553c2717ae2feeec3cc821e647d9e2f70a83d with SHA-1 11f544ca is already in history

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

Change-Id: I1ce15064f90e7c7011066339bc2394e1bde3eaec