[automerger skipped] Merge "Add constant for SC V2." am: b4bcc859 am:...

[automerger skipped] Merge "Add constant for SC V2." am: b4bcc859 am: ef662c60 am: 4f7c212c -s ours am: 36ad429c -s ours

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

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

Change-Id: Ifc14a4ee80e5cb72a1163585745a9f4c0ff4f783