Merge "Support GKI updates" am: 4c5220c2bc

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1377700

Change-Id: I6ab33869ff501994d73a4371268e78823c345208