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

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

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