Merge changes from topic "odm_dlkm" am: 8917f7996f

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

Change-Id: I2e4fdbcc6498addf69614d6f8c17b19154c27d52