Merge changes from topic "odm_dlkm" am: 8917f7996f am: 909178164a

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

Change-Id: I6d0b1be1a46288fff42c3689dbef2f7443efebcc