Merge "Merge \\\\"Correct parentActivity example in Activity Element docs.\\\\" into mnc-io-docs am: 893413e50c am: ce2e9d8716 am: 3f1741a19c am: 0ea3ffd6c1" into nyc-mr1-dev-plus-aosp