tree 084f6c5e70548cacb0ef20cbffe796b9cd87d733
parent ef03eef383dd33d8dca48a8301e0487d20154dcf
parent f74d61e3494ee70bad782653487304e1a569912a
author Bill Yi <byi@google.com> 1609883932 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609883932 +0000

[automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE am: 7c51d435e9 -s ours am: f74d61e349 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6de77b6a3723a2b9015056c73694cac59520ab6d