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

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

Change-Id: I1a1c9b2d437ea87c4eeecbd9ac5f2c1357cfcd17