Merge "Merge "Handle the visibility of sdk sandbox uids" into tm-dev am: 6c0ca16d0b am: 06b7570ffe" into tm-d1-dev-plus-aosp