Merge "Add proto definition for boottime metrics" into stage-aosp-master