Merge "Media - Don't animate during camera gesture" into rvc-qpr-dev am: 58e3d8b33e

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

Change-Id: Ia2e4cfce50eb8f0d605da12d63c25104e7be1f16