Merge "Release virtual display before stopping projection" am: 2bd3073819 am: 042c3a3311 am: a35e9a077a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief2b7bfe500f5d873aa1cdd5c8c5baed7693065a