Merge changes I78b3a9c8,I0ee5ce48,I2bb0a12f

* changes:
  More robust @RequiresPermission handling.
  Add RequiresFeature annotation.
  Add auto-doc support for @StringDef.