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

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

Change-Id: I3eb16c525fa951590ea0d90aa95127acd9185265