Merge "Fix logic error in WMShellBaseModule.java break OHM function" into sc-v2-dev am: 17b9e72d9b

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

Change-Id: I27eac4ba5c270fa7357930399057734e8b5d3ee7