Merge "Fix the secure flag check for blackout layer issue" am: 0a7f5e2f0a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1673165

Change-Id: If81b31315a3e5497c4285473ac66194e91bd7bac