Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev
am: bdd0a2b14a

Change-Id: I4697f24ecef7cc439c94352ba2aaf98cf34bbe61