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

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

Change-Id: I08b6dfa71c0239201b7f30f84d1164573697e22d