Merge "Fix deadlock issue." am: 6619bac824 am: cadcd9c225 am: acc96efcfa

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

Change-Id: Icb20857776295337f74496b85fa1dc9a36f8e537