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

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

Change-Id: I0ca4ee8e25653833a2ff03dfd753cd78a9dc0cde