am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev

* commit '131e6b24d88c4704687f41e9a016ab1919c53fa4':
  Prevent system uid component from running in an app process