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

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

Change-Id: Ib49f892a0a9c27a33c33b2be89f1b37367d4da0d