Merge "Add NATIVE_WINDOW_CONSUMER_IS_PROTECTED enum" into oc-dev
am: 6399d45725

Change-Id: Ic1b31382ccf4d658a1d36c23bbf276c8d143c620