Merge "goldfish: fix selinux problem with shell" am: 444d3cba07 am: 9ff2b4b36a

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1455225

Change-Id: I645d50d7ea0499f26402cec1b91f55b5fae28d9e