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

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

Change-Id: Ie01684fa10a937606b681ea6b83e53b64f346e2c