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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c230337c2ccc8a547efc9377b868556ccf934fe