Merge "Fix default value type : should be long instead of int .." am: 061654bdc3 am: ea1c39cede am: 6c7a850439

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

Change-Id: I1abed08db3ced0dd65aceb037bcc6e9a1f837dbb