Merge changes from topic 'presentFenceNotReliable' into oc-dev

* changes:
  egl: Use reserved values for eglGetFrameTimestamps
  egl: Differentiate pending vs invalid timestamps.
  egl: Avoid use of retire as present

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger_hwc1.cpp
Simple merge

diff --cc vulkan/libvulkan/Android.bp
Simple merge