am aac20cfc: (-s ours) am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev

* commit 'aac20cfcb4752a38bb27fb134869868c487d855f':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]