Merge "Add displayPresentTime to NATIVE_WINDOW_GET_FRAME_TIMESTAMPS"