[automerger skipped] Merge "Add null checks for ConcurrentHashmap queries"...

[automerger skipped] Merge "Add null checks for ConcurrentHashmap queries" into sc-v2-dev am: 66889d32 am: c944e424 -s ours

am skip reason: Merged-In I7fc9ccb45987e03f6f172a077303c25d5ae1ccf3 with SHA-1 8596dd12 is already in history

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

Change-Id: I3ef501bffbda2befcb28e469d8b03fbd4c76b522