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

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

Change-Id: I46c856268b104edaaaa1fa8e61f87e2bb9e9d146