[automerger skipped] Merge "Fix the the proto definition for app startup and...

[automerger skipped] Merge "Fix the the proto definition for app startup and fully drawn events." into rvc-qpr-dev am: d41c1196 -s ours am: 398301fd -s ours am: 4f5f93cb -s ours

am skip reason: Change-Id I36ec354d273dceace5245d7634c68ac63dc5a8cd with SHA-1 15b86108 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I574281cbf993c013eb3027f7c482194f492bc3c6