Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3
am: 83e283b22f

Change-Id: I00c39e0c329dda6ab66820d3a858f5daeecdb6c7