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

Change-Id: I48cc297e385e86e52621370ee3893f8254708615