[automerger skipped] Merge "use consistent method to generate constant value"...

[automerger skipped] Merge "use consistent method to generate constant value" into sc-dev am: f6d4d22f -s ours

am skip reason: Change-Id I32b611661918628c5b8d125ff738069cd2940cb9 with SHA-1 01f8e8df is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia876e6bbe0a5e7f4e204458c60c4b83f18e179d3