Merge "Fix race condition resulting in unbalanced wakelock calls" into tm-dev...

Merge "Fix race condition resulting in unbalanced wakelock calls" into tm-dev am: 4d034ec4 am: 6c950c1e

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



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