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

Change-Id: I75cac67a55969ced8379368e7b74b9e6e9ef79c0