Merge "Dismiss immersive mode confirmation on setting changed to confirm" into...

Merge "Dismiss immersive mode confirmation on setting changed to confirm" into sc-dev am: c41c018a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14439509

Change-Id: I9d8e14910106f7e460c55dbb1a2be3f872c295f9