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

Change-Id: Ie349a765da66ae6b140a17d9062c180a52e77cb3