Merge "Reduce storage requirement for Terminal App" into main am: 7d6225d0

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3499330



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