Merge "Fixed an issue where media could flicker during bypass" into sc-dev am: eb89b5cf am: f13bbe0e am: dfd8ea98

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

Change-Id: I7888a24abfbcfa24d736241048b4100c1e8c34c8