Merge "Fix stuck while disconnecting chromecast" am: 54af419702 am: dd263072a9

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1580283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51f8aef255f52e72a02b09b4d60b9b3e21b5fd2e