Merge "Fix concurrent capture handler" into tm-dev am: a18a8a12 am: 7398b8a5 am: 4090220c

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



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