Merge tag '3.5' into master am: a9f20263fd am: f01db3250c am: 020ef46b19

Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2496622

Change-Id: I1c1b95d5d3681d0d8c74feb6574027e2e8c412a2
Signed-off-by: Automerger Merge Worker <[email protected]>