[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: f6ec19ee96 -s ours

am skip reason: Merged-In I93c0c690632ff072eb1430fa63bfaec80d78c768 with SHA-1 50b5e88b7c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/ti/beagle-x15/+/15571729

Change-Id: I0b0f258367751e423abcb3b2402ce51b0fcf9e14