Merge "Fix Deadlock Issue On AppFuseBridge" am: 276ae01776

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

Change-Id: I1b390647e8ac4260b62c216e1c030f514ca76db6