Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: db9ea17177 am: b548de7856 am: cd42593479

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045979

Change-Id: Id302758aa15d64b8d7e00628f90b13782213fb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>