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

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



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