Merge "Merge "[SF] Don't reset display state on reconnection" into rvc-dev am: 810a7553 am: bc6f804b am: 19e90398" into rvc-qpr-dev-plus-aosp am: 5a108bf1

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

Change-Id: I575b8b68485b109bac00f08788a33eb1f3681d33