Merge "Set device credential's Window flag to be SECURE." into oc-dr1-dev am: 83c49be1da
am: fb06488712

Change-Id: I1153c5c89819e8083d77d0ecd9e3ca982d199f40