chore: chore/7.16.0 revert merge mainmerge (#8682)

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

Revert merge from main for 7.16.0

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

.github/workflows/create-cherry-pick-pr.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       branch_name:
-        description: 'Target branch name to merge the cherry-picked branch into'
+        description: 'Branch name you want the cherry-pick branch to be based from'     
         required: true
       commit_hash:
         description: 'Commit Hash'     

.js.env.example

@@ -53,10 +53,4 @@ export WATCHER_PORT=8081
 export METAMASK_ENVIRONMENT=""
 
 # Build type: "main" or "flask"
-export METAMASK_BUILD_TYPE=""
-
-# Segment SDK proxy endpoint and write key
-export SEGMENT_WRITE_KEY=""
-export SEGMENT_PROXY_URL=""
-export SEGMENT_DELETE_API_SOURCE_ID=""
-export SEGMENT_REGULATIONS_ENDPOINT=""
+export METAMASK_BUILD_TYPE=""