Merge "Migrate frameworks/base/packages/Shell to androidx.test"
am: fae40404f7

Change-Id: Icc87997f68dcc8256fec71d213ea754d8bd8c729