Merge "Prevent potential NPE of checking task drawn for logger" into sc-dev am: ad1cfd0d am: 15e091a7

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

Change-Id: I176beaebad13d4c30e600f22271eb5b2edba6b0e