am 5f1aa33a: am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev

* commit '5f1aa33aa321f61ba9b5cffbef6d80ae79c55455':
  DO NOT MERGE. Example code for FileProvider.