Merge "Fix ErrorProne finding in WmTests" into tm-qpr-dev am: 2f186cfad9 am: 407512600f

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

Change-Id: I8e88aad4e4b34623fc29041d839c60cc57399089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>