Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev am: fd6ddcd050 am: a77928c6f4

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

Change-Id: I24fe78f83a7fea2e9baa1269b017a55ed3bdfc2c