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: Ia7aa258b642666276cc36d50638242e7ebd89225