[automerger skipped] Revert "[PIA] add missing flag checks" am: cce18844 -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: Id2e2803cf4bfbe225dd2b3130cf3009825932176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>