Merge "Merge "Metrics for content capture." into qt-dev am: 815979d5df am: 851c703681" into qt-r1-dev-plus-aosp