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

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

Change-Id: Ia3890f931d43a0a8fb744c2b94189a8d4bcba46b