[automerger skipped] Merge "Add proto definition for boottime metrics" into stage-aosp-master am: 9013b8eb92 am: 5f3a39e6cc -s ours
am skip reason: Change-Id I26cbca3b6f2d9f990dde31ac0880272ac141ff36 with SHA-1 3e033cb1da is in history

Change-Id: Ia50df69807f9eee1f0bc94ce64a11de90d1a7e18