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

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

Change-Id: I5dfcf1c436b14d28db027f1300ce136fbc3f0e38