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

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



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