[automerger skipped] Merge "Add App Usage atom to atoms.proto" into rvc-dev...

[automerger skipped] Merge "Add App Usage atom to atoms.proto" into rvc-dev am: 098e95bb am: e2ad667c -s ours

am skip reason: Change-Id Ie0fd99df5b1d8776b6e3c29f7fb2da4759bb465d with SHA-1 8d8ff53c is in history

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

Change-Id: I0eb21177b7c74d171a238464e56e8547ebfa08fb