Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b
am: 0c59dca90d  -s ours

Change-Id: I10ea3abe4e4a04fa779cd51cee141cb80cb76acf