Merge "Add a check to ensure that intent data is available before proceeding."...

Merge "Add a check to ensure that intent data is available before proceeding." into main am: 9a0ba22e am: 2c3fbda0

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3278732



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