Merge "Non-module targets." am: 586e350678 am: 23bc45ad99

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

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