Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d

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

Change-Id: If8cd3e5f3aec33840fc5a7477e2895dc6f2a158c