Merge "Fix anr when open connected devices" into sc-dev am: 94c64def am:...

Merge "Fix anr when open connected devices" into sc-dev am: 94c64def am: 1e49a3c2 am: 2e6cbf9a

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

Change-Id: I28ec40aebcad2de42d6d7ac89d81f41d776ee088