Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell"