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

* commit 'af6eaf656ec0de5fcbea03968daffe2c845e2089':
  Fix ANR caused by hwuiTask thread