[automerger] Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev am: 82614bed0b am: 6d82626ade

Change-Id: I85fd18b3126c7be79e7d6dc7d7d76235b64b01fb