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

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

Change-Id: I4573004b3c6e56c0157a7c937e00174cb4fcb84a