Merge changes from topic "felix-rotate" into tm-qpr-dev am: 9c9e453b

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



Change-Id: I6a059d4ca5b3ae7e455c190a370c86595fa47316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>