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

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

Change-Id: Idddf77f75b799af9b6524637d73ec702d99dc62d