Merge "Fix deadlock issue." am: 6619bac824

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

Change-Id: I1df0b7636d7e6f91435faaaee4e2568b2da05ab0