[automerger skipped] Added setup/tear down data support am: 09c6189a am: 10494575 am: ec849ed6 am: 159dd378 -s ours

am skip reason: Merged-In I837606d9e91339c66f2e2cff1a3a76d1029750c6 with SHA-1 69af7793 is already in history

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

Change-Id: I1b63a38fdf9c34b36d54bfd0040bb72cf9ef2822