[automerger skipped] Merge "Abandon sessions before/after running tests" am:...

[automerger skipped] Merge "Abandon sessions before/after running tests" am: 347e38a8 am: 6317806d am: 4327c4ec am: bcd39eca am: bec81240 -s ours

am skip reason: Change-Id I3ad6317eaee3ffb4c6351c630460dd8f1d27e644 with SHA-1 be2c3fc5 is in history

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

Change-Id: Id37b176d8006622b0e600d9a84dfd1eb2a807590