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

Change-Id: I2a7a57a4b63b5ed34e65801f27582f26b3eb1baf