Merge "Add CTS tests for ActivityOptions.makeBasic()" into oc-dev