DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 1b93aa26a4

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

Change-Id: I9877b7392e83541550293daeebd1b91d54b29b8a