Merge "Fix SF hint sessions for virtual multi-display case" into tm-qpr-dev am: a69f18cf08

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

Change-Id: I40fbf92a62181af7389ad1d887d86d6d8e7a5158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>