Merge "Add back api= as an attribute to @RequiresApi" into nyc-dev
am: abd59f5b4c

* commit 'abd59f5b4ca785f5f1558953e7ab666cb763aa87':
  Add back api= as an attribute to @RequiresApi

Change-Id: I8e5d63e81676c900741e38568952557c41116460