[automerger skipped] Merge "Add Constants for UsageSetting" am: 569fbec7 am:...

[automerger skipped] Merge "Add Constants for UsageSetting" am: 569fbec7 am: 4b9ed092 am: 8b0cf593 am: c20de313 -s ours

am skip reason: Merged-In Ief078770b44719e105828bb61d3768ad24e277dd with SHA-1 793736cc is already in history

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

Change-Id: I22491469a030043255fc372bfeac841ca981bb1b