Merge "Set device credential's Window flag to be SECURE." into nyc-dev
am: e69c4dcb8f

Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b