Merge "Abandon sessions before/after running tests" am: 347e38a87b am: 6317806d3c am: 4327c4ec4b am: bcd39eca7d

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

Change-Id: I993f6f29e49e28d00e7a5ccb3066347851917ea7