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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65e6c014643c59c8b6c04f981eb4d837e50fd864