[automerger skipped] Merge "Add constant for SC V2." into sc-v2-dev am: b16d94b4fb -s ours
am skip reason: Merged-In Ieecebfccf9366815c93d620b70aeabc1abcd3ebd with SHA-1 204a9dfbfb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16131559
Change-Id: I3de9175bc6e5449e7db82017fd5abd0c3998d92a
This commit is contained in: