am 706efb22: resolved conflicts for merge of 83755972
to klp-modular-dev-plus-aosp
* commit '706efb2254b68a6cd2441b519dd8445ca3df362d': Add SELinux restorecon calls on ASEC containers.gugelfrei
commit
1d87676b82