Merge changes I3ef77f56,Ia774f27a into udc-dev-plus-aosp

* changes:
  Clarify alternate API for getWindowNativeHandle
  Deprecate AImageReader_getWindowNativeHandle