Merge "Add uptimeNanos to SystemClock" am: 52c8422ea1 am: c7a2225665

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1394287

Change-Id: I8dd8c3e148a011b250260a2ebc329fdeb06433a6