am 4b9f5130: Merge "Update AOSP browser to use the new FileChooser API" into lmp-dev

* commit '4b9f51307eb0d65063728ab7ae2d52e9dc5bd2ab':
  Update AOSP browser to use the new FileChooser API