Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"