Merge changes from topic "board-system-ext-sepolicy" am: 6d34f734ae

Original change: https://android-review.googlesource.com/c/platform/build/+/1273731

Change-Id: I33b355bb22456ea821d69cf774200b38848330de