Merge "Set device credential's Window flag to be SECURE." into oc-dev
am: e3d0bbcc80  -s ours

Change-Id: I8be390dc1e5190029be41a55c014c9e2705c7aef