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

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

Change-Id: Iefea5fa022e257bdd215e40893cd0fcc3318d2d9