[automerger skipped] Merge "Add null check to updateHasAboveClientLocked" into main am: 92b9ed7e28 -s ours am: e93f101c2e -s ours

am skip reason: Merged-In Iee5024b8f13771bc98a39a20e5f96a89a4c79b4e with SHA-1 cd8f5d8b18 is already in history

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

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