Merge changes from topic "am-4493549d7d1a410f880c7c44afed2208" into udc-dev am: 6dea4048

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



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