Merge "Fix ANR caused by hwuiTask thread"
automerge: 5ad36d4

* commit '5ad36d4591e7b3b1b74f0a213d18384f53734ab2':
  Fix ANR caused by hwuiTask thread