Merge "Fix anr when open connected devices" into sc-dev am: 94c64def am: 1bb9f206 am: 0d9a861b

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

Change-Id: Ie0528da4216444d51544f0319eacec1322a5a3c0