Merge "Avoid automatically mirroring Drawable of CustomTile"
am: 9a904d68c7

Change-Id: I337620f4a2514a00a6b49275cadde6087e11dddf