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

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



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