Merge "Fix virtual display cannot be relased." am: 2bddd216 am: fbdd340c...

Merge "Fix virtual display cannot be relased." am: 2bddd216 am: fbdd340c am: d9be47a7 am: 21bef3cb

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



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