The buildDynamicPropertiesMap method may return an empty unmodifiableMap, but not null.

Comment From: chenqimiao

This PR is already included in #24796.