[automerger skipped] Add null check to updateHasAboveClientLocked am: fc27817d -s ours am: aee0003c -s ours

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

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



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