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

Change-Id: Icabcb4e7ec6c930b19fab2418bd3f33f6427ecfa