Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev