Merge "Fix ActivityNotFoundException" into udc-qpr-dev am: ebab5f6e38 am: 6e256487b3

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

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