Entity removeAliases now resets array keys

Bug: 51192
Change-Id: Iabbc7123378de1c1408ba95e262db947eef64239
Merge "Entity removeAliases now resets array keys"