Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev
am: 82614bed0b

Change-Id: If4791df1abd1354e886ddb528da87e57b556deb0