[automerger skipped] Merge "Add constant for SC V2." into sc-v2-dev am:...

[automerger skipped] Merge "Add constant for SC V2." into sc-v2-dev am: b16d94b4 -s ours am: dc40681a -s ours

am skip reason: Merged-In Ieecebfccf9366815c93d620b70aeabc1abcd3ebd with SHA-1 204a9dfb is already in history

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

Change-Id: I7b6af296f02eaee7b29d8e074b0d760b3a314c6b