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