[automerger skipped] Migrated various apps under frameworks/base/packages/Shell  to androidx am: ec8d258c60  -s ours am: 973c33f542  -s ours
am: 9c729ed806  -s ours

Change-Id: Ia7cf9102871f9239d8d292da4d56c94ef3f6bc80