[automerger skipped] Merge changes Ie9410637,I0486d5fb into udc-qpr-dev am:...

[automerger skipped] Merge changes Ie9410637,I0486d5fb into udc-qpr-dev am: 23fbc714 -s ours am: 33e2e6e0 -s ours

am skip reason: Merged-In Ie9410637ad092bff22b2c0fe1c92e516a1f24ee0 with SHA-1 d2c7f85b is already in history

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



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