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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f7dd7113c76aa098c774b7ba831281ccde89652