[automerger skipped] Merge "Fix default value type : should be long instead of...

[automerger skipped] Merge "Fix default value type : should be long instead of int .." into sc-v2-dev am: 4de0b165 -s ours am: 6998eda5 -s ours

am skip reason: Merged-In Ic5505236dd10fad6f9a46e9cf24493d8b4cf8404 with SHA-1 7332dedc is already in history

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

Change-Id: I76a8ffca582d3b09469011f391f6af03460c097f