[automerger skipped] Merge "Fix the secure flag check for blackout layer issue" am: 0a7f5e2f0a am: d86fcaadc9 am: c21cdb4b14 -s ours

am skip reason: skip tag Change-Id Iad53411ea642fee3e5b09222760a223b4ada61ad with SHA-1 a102ff9348 is already in history

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

Change-Id: Idd50458dd38b9698f08fd6624fe3f98faa28f368