Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Support preformatted property documentation
  HTML escape property documentation

Bug: 67909957
Test: manual inspection
Change-Id: If4d8cefe3fea940d08e5c75b3faa877aad7d6988