Unstick AM am: ed6bccd828

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie70ddb083af27ba195a2309d0fe41b050500c562