Merge "Reduce unnecessary config propagation of default display" into sc-dev am: 00a39566 am: 55a6725e

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

Change-Id: Ib8a45dd83acfcaba1943a53161f1e437d02e1d02