Merge "Merge "Add ImageDecoder.Source for resources" into pi-dev am: d65f5ed038" into pi-dev-plus-aosp
am: 84474dbe76

Change-Id: If06c6c2e18a685e949c51a033200c9b044e4007c