Merge "Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: a457821085" into rvc-d1-dev-plus-aosp am: 516c22c8f2 am: 91e60f70b1

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

Change-Id: Icf60702adc32180cd9510b4881e9d4b95564282f