Merge "Refuse update of a system app if it changes its shared uid"