Move Terminal to androidx.
am: 9f74242050

Change-Id: I84d84fc2ad14b07dfe78f9fd0ab19fda494f7642