Merge "Add null checks for ConcurrentHashmap queries" into sc-v2-dev am: 66889d3212

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

Change-Id: I408b2c839f891e46724aebfd0ae1ac0c655eb3ab