Merge "Add a photos app filter and a metric for using it." into oc-mr1-dev
am: 55cd5e185a

Change-Id: I66618c70782cae85036185e14e9a20b8568f90ec