[automerger skipped] Merge "Revert "[PIA] add missing flag checks"" into...

[automerger skipped] Merge "Revert "[PIA] add missing flag checks"" into 24D1-dev am: 6ed9de97 -s ours

am skip reason: Merged-In I09d0f919557433ec4f56ab0a8ad2da1d3d2dccf6 with SHA-1 c367000a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26517100



Change-Id: I29442a0a79fba419704c002c31cbd50ed912b7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>