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

Change-Id: I0a2e2f1d950a26727baf50a81bed8a731dda83de