[automerger skipped] Merge changes from topic "wake_lock_fix" into udc-qpr-dev...

[automerger skipped] Merge changes from topic "wake_lock_fix" into udc-qpr-dev am: b87bd290 -s ours am: 7834ad75 -s ours

am skip reason: Merged-In I16555608176f1b1dfa180e82346319b55c19de01 with SHA-1 4ec78f5b is already in history

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



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