Merge "Add uptimeNanos to SystemClock" am: 52c8422ea1

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

Change-Id: I540cfc5c783411ff513bb1cda1d9e3e5a2f0b3b9