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

Change-Id: If54feb86d47552ea89da661c7769a25efe669237