[automerger skipped] Migrated various apps under frameworks/base/packages/Shell  to androidx am: e0efaddbeb  -s ours
am: 82fa377bba  -s ours

Change-Id: Ia6aad32389ed8eb49bceb04973e5c94db5c74f66