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