Merge "Fix incorrect NULL check in IncFsFileMap reference assertions" into main am: 2576ad7087

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

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