Merge "Set device credential's Window flag to be SECURE." into oc-dev am: e3d0bbcc80
-s ours
am: 9bb4e0b794
-s ours
Change-Id: I139f18df764f1d888cc6d7687aba5a23ab30053f
This commit is contained in: