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

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



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