[automerger skipped] Merge "fix the NPE problem due to add null...

[automerger skipped] Merge "fix the NPE problem due to add null InsetsControlTarget object to map ." into main am: d16b5596 am: 4660f140 -s ours

am skip reason: Merged-In I8be582c42c6ba7524a3d6edc0a36aa4856e10e71 with SHA-1 9d4ae5da is already in history

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



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