Merge "Fix concurrent capture handler" into tm-dev am: a18a8a12

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



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