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 am: 8cbb967b

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

Change-Id: I5cbd256c4a0cb881834b995d3aef791275881125