[automerger skipped] Merge "Fix WMS instance leakage of WmTests" am:...

[automerger skipped] Merge "Fix WMS instance leakage of WmTests" am: 49c0c87c am: e77b1ef5 am: 0d54d436 -s ours am: 451bc562 -s ours am: a9fb23c2 -s ours

am skip reason: Merged-In Ic06d85978886caaea3a9eb123a7a59712b58bb92 with SHA-1 4c03bb0c is already in history

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

Change-Id: If9c32b25f1ec2c2227fd2d797e5712ce87e39254