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

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

Change-Id: Ie639daa509dce6e2dbd98cf285d67effdd98a522