Merge "[Setting crash] The dialog is null am: 8514ff65eb
am: b6bd4143cd" into tm-d1-dev-plus-aosp am: d5bcf3fd1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471 Change-Id: I8ea83f95b0f8f3eac49e310689cfac5f68d8d349 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: