Merge "SELinux changes for Treble Loadable Kernel Module" am: e3be5d6bd3 am: cf611a3bfa
am: eb02b9a062  -s ours

Change-Id: I773b392db75e22161c25bc71d1fb09684f150ea5