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

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

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