Merge "Use annotation id @SystemApi constants in StatsLog" am: eb043b78a5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e4adc2d6e5e8dcea181d6cbcb93f87b3e103ac2