Merge "Enable Linux terminal app via developer settings" into main am: 6c084bf7c8 am: 5b55045cfe

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3294813

Change-Id: I0f449f607ae501dc7bda29384d709f5c187af709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>