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

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

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