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

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

Change-Id: Ifff2cbf59238ac785e4a70f0cb4db6a1af763426