Merge "Stop active callbacks from being stopped on starting new projection session" into udc-qpr-dev am: 742e559d26

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

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