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

Change-Id: Ia069a59715a6057aba0c742a806cf73fe85489f9