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

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

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