Merge "Merge "[SF] Don't reset display state on reconnection" into rvc-dev am:...

Merge "Merge "[SF] Don't reset display state on reconnection" into rvc-dev am: 810a7553 am: 13e6b16d am: 9d031d25" into rvc-qpr-dev-plus-aosp am: f6f9b940

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

Change-Id: Ib7debafb5e378c593cc8afa01f745f04acb89fa4