Merge changes from topic 'n-versioncode' into nyc-dev

* changes:
  A little more on issue #30766518: Document what targeting N does
  Cherrypick so we can publish N version code description ASAP