[automerger skipped] Merge "Fix WMS instance leakage of WmTests" am: 49c0c87c79 am: e77b1ef5a8 am: 0d54d43602 -s ours
am skip reason: Merged-In Ic06d85978886caaea3a9eb123a7a59712b58bb92 with SHA-1 4c03bb0cbb is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036104
Change-Id: I8c939b207587c16e3ef8310fb78c890ef57c4494
This commit is contained in: