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

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

Change-Id: Ibc7cc1f01432452a18588f64409dbc0570b932a8