[automerger skipped] Added setup/tear down data support am: 6eb9d8ab65 am: 01476831a4 -s ours
am skip reason: Merged-In I3fe553c2717ae2feeec3cc821e647d9e2f70a83d with SHA-1 11f544ca7f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17074171
Change-Id: I3e791adc5a74859214c93f17fad3253b92faa394
This commit is contained in: