[automerger skipped] Merge "Merge "Metrics for content capture." into qt-dev am: 815979d5df am: 851c703681" into qt-r1-dev-plus-aosp
am: 8f1bbfd4c2 -s ours
am skip reason: change_id If43465ccee7454a7ebf9e15caa23fce7bae33cfe with SHA1 420947c4cc is in history

Change-Id: Ibeb513240a186d62b24ac0777878f9789fc888b6