Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am: 04d43a6a7b

Change-Id: I2936fc48db92ad5846b5c72549d265ce4180686d