Merge "Return 0 instead of NULL for jlong" am: c3e03c1c3d am: 28dc02a29b am: ee32f1583f am: 0e5d78d7de

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

Change-Id: Ic0ef3248024ecd92f639936b6c09b10a2d1eb9cd