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

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