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

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

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